Commit Graph

18801 Commits (a5ef7e546c91fd199c6370cff6c4d4fd274949e8)
 

Author SHA1 Message Date
Markus Kahl a5ef7e546c decode URI path 10 years ago
Markus Kahl 87047ffec0 whitespace 10 years ago
Markus Kahl 316db74fab don't choke on missing files of corrupt attachments 10 years ago
Markus Kahl d8db13480d whitespace 10 years ago
Markus Kahl 14b1eb0170 local (file) and remote (s3) carrier wave storage 10 years ago
Alex Coles 24f496a9a0 Merge pull request #2397 from opf/feature/update_grape_and_reform 10 years ago
Jan Sandbrink 8ea03ed90a Merge pull request #2401 from oliverguenther/feature/apiv3-user-lockunlock 10 years ago
Oliver Günther 7c7d97bc0f Added InvalidUserStatusTransition to (un-)lock transitions 10 years ago
Oliver Günther c819974a9b Adding account status flag to user model, changed (un-)lock response 10 years ago
Oliver Günther 6f47d1c716 Minor changes regarding the lock user definition 10 years ago
Jan Sandbrink 8c0172872d fix metadata in examples 10 years ago
Jens Ulferts 35fec4cf3a fix inconsistent spec 10 years ago
Jens Ulferts 6b7e33da5f alters order of API routes 10 years ago
Jens Ulferts d7da47bea5 updates api gems + dependent ones 10 years ago
Oliver Günther f4b70ddf4e Added empty body to please snowcrash 10 years ago
Oliver Günther 084f15ab44 Extend apiv3 blueprint for user (un-)locking 10 years ago
ulferts a8a90dcb00 Merge pull request #2400 from opf/feature/npm-shrinkwrap-dev 10 years ago
Alex Coles 452a4d965c Merge pull request #2398 from opf/feature/add_localization_for_id 10 years ago
Alex Coles afefa1e817 Document shrinkwrap workflow in DEVELOP 10 years ago
Alex Coles 01efb3d58e Lock down dev dependencies w/npm shrinkwrap too 10 years ago
ulferts b672569a1c Merge pull request #2399 from opf/fix/spec_stability 10 years ago
Jens Ulferts cf44eee0ee increase spec stability by waiting for modal 10 years ago
Jens Ulferts d79806bafe adds i18n for id 10 years ago
Alex Coles 1715578281 Merge pull request #2396 from opf/feature/update_roar 10 years ago
Jens Ulferts f9baee0bb7 update roar to 1.0.0 10 years ago
Alex Coles 6571905708 Merge branch 'release/4.0' into dev 10 years ago
Alex Coles 1057cc2201 Merge pull request #2395 from opf/hotfix/no_sort_in_session 10 years ago
Alex Coles b388d1eeef Merge pull request #2394 from opf/fix/fix-karma-webpack-version 10 years ago
ulferts 28a5cdbfe2 Merge pull request #2327 from opf/fix/specify_null_links 10 years ago
Alex Coles f5f51e6e67 Stay on karma-webpack 1.3.x 10 years ago
Jens Ulferts e844362a8e no longer use sort criteria of session for wp index 10 years ago
Jens Ulferts 4a60c2a7b2 Revert "Merge pull request #2372 from 0xF013/feature/17263-save-button-conditions-fix" 10 years ago
Alex Coles 6154c63abe Merge pull request #2379 from opf/fix/date-time-directive-test-cleanup-hook 10 years ago
Alex Coles eb738cd4fa Merge pull request #2393 from marutosi/finn/pry-byebug 10 years ago
Toshi MARUYAMA 0cc763330b Gemfile: use no version mri for pry-byebug 10 years ago
jonasheinrich 6cf3138206 Merge pull request #2392 from opf/feature/update-copyright-header-2015 10 years ago
Alex Coles e0191e759c Update year in copyright header to 2015 10 years ago
Alex Coles 4912d56f7a Merge pull request #2390 from 0xF013/feature/migrate/relations-to-ui-select 10 years ago
Mihail Maxacov b423201f08 migrate relations to ui-select 10 years ago
Alex Coles 6d88d71c81 Merge pull request #2372 from 0xF013/feature/17263-save-button-conditions-fix 10 years ago
Mihail Maxacov 1c3076701e fix save button display conditions 10 years ago
Alex Coles a040e523ba Clean-up (unset locale) after each dateTime test 10 years ago
Alex Coles 0b6a2c7ad0 Fix missing dependency after bad merge (4ece85c3) 10 years ago
Alex Coles b219b6d307 Fix dateTime directive test for dfc241b3 changes 10 years ago
Alex Coles 4ece85c316 Merge branch 'release/4.0' into dev 10 years ago
Alex Coles d6708a0e57 Give function added in dfc241b3 a better name 10 years ago
Alex Coles f5609c7fd9 Merge pull request #2378 from 0xF013/hotfix/17069/dates-in-wp-table-displayed-in-german-when-english-language-settings-selected 10 years ago
Mihail Maxacov dfc241b3e1 fix dates in wp table displayed in german when english language setting selected 10 years ago
Alex Coles 3f4c6619d2 Merge pull request #2376 from 0xF013/feature/17647-available-status-options-not-updated-when-removing-relation 10 years ago
Mihail Maxacov 93867a20b3 Merge pull request #2377 from opf/feature/angular-1.3.8 10 years ago